RethinkDB 2.3.6, w/ culling of less than latest#3530
Merged
tianon merged 2 commits intodocker-library:masterfrom Oct 4, 2017
Merged
RethinkDB 2.3.6, w/ culling of less than latest#3530tianon merged 2 commits intodocker-library:masterfrom
tianon merged 2 commits intodocker-library:masterfrom
Conversation
tianon
reviewed
Oct 3, 2017
library/rethinkdb
Outdated
| 2.3.6: git://github.com/rethinkdb/rethinkdb-dockerfiles@da98484fc73485fe7780546903d01dcbcd931673 jessie/2.3.6 | ||
| 2.3: git://github.com/rethinkdb/rethinkdb-dockerfiles@da98484fc73485fe7780546903d01dcbcd931673 jessie/2.3.6 | ||
| 2: git://github.com/rethinkdb/rethinkdb-dockerfiles@da98484fc73485fe7780546903d01dcbcd931673 jessie/2.3.6 | ||
| latest: git://github.com/rethinkdb/rethinkdb-dockerfiles@da98484fc73485fe7780546903d01dcbcd931673 jessie/2.3.6 |
Member
There was a problem hiding this comment.
This commit needs to be updated to 05946c0dbe3c7fa9338d3827428b2c32074a1447 (rethinkdb/rethinkdb-dockerfiles@05946c0), right?
It's probably worth considering swapping to the newer file format too, since it'll make things simpler to update by hand:
Maintainers: Daniel Alan Miller <dalanmiller@rethinkdb.com> (@dalanmiller)
GitRepo: https://github.com/rethinkdb/rethinkdb-dockerfiles.git
GitCommit: 05946c0dbe3c7fa9338d3827428b2c32074a1447
Tags: 2.3.6, 2.3, 2, latest
Directory: jessie/2.3.6
Contributor
Author
|
Updated to new format, thank you for the assist @tianon 👍 |
Member
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 248573e..16c952c 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,5 +1 @@
-rethinkdb:2.0 @ amd64
-rethinkdb:2.1 @ amd64
-rethinkdb:2.2 @ amd64
-rethinkdb:2.3.4 @ amd64
rethinkdb:latest @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index a4ad519..bc08a7e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,11 +1,4 @@
rethinkdb:2
-rethinkdb:2.0
-rethinkdb:2.0.4
-rethinkdb:2.1
-rethinkdb:2.1.6
-rethinkdb:2.2
-rethinkdb:2.2.6
rethinkdb:2.3
-rethinkdb:2.3.4
-rethinkdb:2.3.5
+rethinkdb:2.3.6
rethinkdb:latest
diff --git a/rethinkdb_2.0/Dockerfile b/rethinkdb_2.0/Dockerfile
deleted file mode 100644
index 5ed037e..0000000
diff --git a/rethinkdb_2.1/Dockerfile b/rethinkdb_2.1/Dockerfile
deleted file mode 100644
index aa03e87..0000000
diff --git a/rethinkdb_2.2/Dockerfile b/rethinkdb_2.2/Dockerfile
deleted file mode 100644
index 0dc04e7..0000000
diff --git a/rethinkdb_2.3.4/Dockerfile b/rethinkdb_2.3.4/Dockerfile
deleted file mode 100644
index 07c929e..0000000
diff --git a/rethinkdb_latest/Dockerfile b/rethinkdb_latest/Dockerfile
index a3adfe1..6ba632c 100644
--- a/rethinkdb_latest/Dockerfile
+++ b/rethinkdb_latest/Dockerfile
@@ -4,10 +4,10 @@ MAINTAINER Daniel Alan Miller <dalanmiller@rethinkdb.com>
# Add the RethinkDB repository and public key
# "RethinkDB Packaging <packaging@rethinkdb.com>" http://download.rethinkdb.com/apt/pubkey.gpg
-RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 1614552E5765227AEC39EFCFA7E00EF33A8F2399
+RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 3B87619DF812A63A8C1005C30742918E5C8DA04A
RUN echo "deb http://download.rethinkdb.com/apt jessie main" > /etc/apt/sources.list.d/rethinkdb.list
-ENV RETHINKDB_PACKAGE_VERSION 2.3.5~0jessie
+ENV RETHINKDB_PACKAGE_VERSION 2.3.6~0jessie
RUN apt-get update \
&& apt-get install -y rethinkdb=$RETHINKDB_PACKAGE_VERSION \ |
Member
|
LGTM Build test of #3530; 66fde2d ( $ bashbrew build rethinkdb:2.3.6
Building bashbrew/cache:c10f2386093ff3cf75d24b32e0ab2dbce1b7d3ffa46f31e528d6b6229c649759 (rethinkdb:2.3.6)
Tagging rethinkdb:2.3.6
Tagging rethinkdb:2.3
Tagging rethinkdb:2
Tagging rethinkdb:latest
$ test/run.sh rethinkdb:2.3.6
testing rethinkdb:2.3.6
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces #3332